]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
dnd: Remove pointless scale factor from restore position
authorSebastian Keller <skeller@gnome.org>
Wed, 17 Feb 2021 00:07:38 +0000 (01:07 +0100)
committerMarge Bot <marge-bot@gnome.org>
Wed, 17 Feb 2021 10:12:00 +0000 (10:12 +0000)
Since 629b7394 we don't use the preferred size anymore, but the original
allocation, so this scale factor would always be 1.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1687>

js/ui/dnd.js

index 0e972a13d75ecf62b6d808377b078fca7c26e572..0af1e7ecc7bf76d048669eccebba9dbf9e2dc737 100644 (file)
@@ -661,15 +661,9 @@ var _Draggable = class _Draggable {
             if (parentWidth != 0)
                 parentScale = parentScaledWidth / parentWidth;
 
-            // Also adjust for the difference in the original actor width
-            // and the width it is now (children of uiGroup always get
-            // allocated their preferred size)
-            const childScaleX =
-                this._dragOrigWidth / this._dragActor.allocation.get_width();
-
             x = parentX + parentScale * this._dragOrigX;
             y = parentY + parentScale * this._dragOrigY;
-            scale = this._dragOrigScale * parentScale * childScaleX;
+            scale = this._dragOrigScale * parentScale;
         } else {
             // Snap back actor to its original stage position
             x = this._snapBackX;